:art: get_qrcode_url

huangqimin001 3 anos atrás
pai
commit
e4e0893196
6 arquivos alterados com 31 adições e 12 exclusões
  1. 3 2
      registration/models.py
  2. 2 2
      requirements.txt
  3. 6 6
      requirements_dj.txt
  4. 2 2
      requirements_redis.txt
  5. 2 0
      utils/redis/rkeys.py
  6. 16 0
      utils/redis/rqrurl.py

+ 3 - 2
registration/models.py

@@ -6,7 +6,7 @@ from django_models_ext import BaseModelMixin
6 6
 from jsonfield import JSONField
7 7
 from shortuuidfield import ShortUUIDField
8 8
 
9
-from api.wx_views import get_course_field_limit_scene_qrcode_url
9
+from utils.redis.rqrurl import get_qrcode_url
10 10
 
11 11
 
12 12
 class BranchCampusInfo(BaseModelMixin):
@@ -192,7 +192,8 @@ class CourseRegisterFieldInfo(BaseModelMixin):
192 192
         }
193 193
 
194 194
     def qrcodedata(self, admin_id):
195
-        qrcode_url = get_course_field_limit_scene_qrcode_url('{}:{}'.format(self.field_id, admin_id))
195
+        # qrcode_url = get_course_field_limit_scene_qrcode_url('{}:{}'.format(self.field_id, admin_id))
196
+        qrcode_url = get_qrcode_url('{}:{}'.format(self.field_id, admin_id))
196 197
         return {
197 198
             'field_id': self.field_id,
198 199
             'course_id': self.course_id,

+ 2 - 2
requirements.txt

@@ -1,7 +1,7 @@
1 1
 StatusCode==1.0.0
2
-furl==2.1.0
2
+furl==2.1.2
3 3
 jsonfield==3.1.0
4
-mysqlclient==2.0.1
4
+mysqlclient==2.0.3
5 5
 rlog==0.3
6 6
 -r requirements_dj.txt
7 7
 -r requirements_pywe.txt

+ 6 - 6
requirements_dj.txt

@@ -1,18 +1,18 @@
1
-Django==2.2.15
1
+Django==3.2.4
2 2
 django-admin==2.0.1
3
-django-detect==1.0.18
3
+django-detect==1.0.20
4 4
 django-file==1.0.4
5 5
 django-json-render==1.0.3
6 6
 django-json-response==1.1.5
7 7
 django-logit==1.1.3
8
-django-models-ext==1.1.9
8
+django-models-ext==1.1.10
9 9
 django-paginator2==1.1.3
10 10
 django-query==1.0.6
11
-django-redis-connector==1.0.3
11
+django-redis-connector==1.0.4
12 12
 django-response==1.1.1
13 13
 django-rlog==1.0.7
14
-django-short-url==1.1.4
14
+django-short-url==1.1.6
15 15
 django-shortuuidfield==0.1.3
16 16
 django-six==1.0.4
17 17
 django-uniapi==1.0.10
18
-django-we==1.5.5
18
+django-we==1.5.6

+ 2 - 2
requirements_redis.txt

@@ -1,3 +1,3 @@
1
-hiredis==1.1.0
1
+hiredis==2.0.0
2 2
 redis==3.5.3
3
-redis-extensions==2.0.0
3
+redis-extensions==2.0.7

+ 2 - 0
utils/redis/rkeys.py

@@ -1 +1,3 @@
1 1
 # -*- coding: utf-8 -*-
2
+
3
+HY_QRCODE_URL_HASH = 'hy:qrcode:url:hash'  # scene:qrcode_url

+ 16 - 0
utils/redis/rqrurl.py

@@ -0,0 +1,16 @@
1
+# -*- coding: utf-8 -*-
2
+
3
+from api.wx_views import get_course_field_limit_scene_qrcode_url
4
+from utils.redis.connect import r
5
+from utils.redis.rkeys import HY_QRCODE_URL_HASH
6
+
7
+
8
+def set_qrcode_url(scene):
9
+    qrcode_url = get_course_field_limit_scene_qrcode_url(scene)
10
+    if qrcode_url:
11
+        r.hset(HY_QRCODE_URL_HASH, scene, qrcode_url)
12
+    return qrcode_url
13
+
14
+
15
+def get_qrcode_url(scene):
16
+    return r.hget(HY_QRCODE_URL_HASH, scene) or set_qrcode_url(scene)